public class Hello {
	public static str getStr() {
        //制造冲突用来测试stash
		return "pc edit the file";
	}
	public static void main(String[] args) {
		//cutey修改了代码
		System.out.println(getStr());
		for (int i = 0; i < 1000; i++) {
			System.out.println("hello world" + (i + 1));
		}

		System.out.println("talk is cheap, show me the code");
        System.out.println("others edit this file");
        //制造冲突
	}
}
